Merge changes I22e6d914,Iabe7ecd9,I79bdb89e,I6a3cedc7

* changes:
  Make two error messages more detailed
  Use the 'override' keyword where appropriate
  Micro-optimize CgroupMap::ActivateControllers()
  Make class SetTimerSlackAction easier to maintain