HLT integration Dec 13-14

Trying once more to submit PR for changes due to integration yesterday:

CMSHLT-189: in master and GRun
CMSHLT-195: in master and GRun

And, also included today's changes:

CMSHLT-201: in master

If successful, please close PR #6906