It probably was a sky marshall although in Canada they are actually RCMP officers. No doubt the increased number was as a result of the events of last week at LHR.

I don't know how many are normally on the flights, but do remember a couple of folks in C not sleeping enroute to TLV last year.

As for the crew, no idea but I would guess they would know who are the air marshalls, it would only make sense they be apprised of who is on board.