Hg: Merge back late 2.0.8 changes from Alan
Hg: Merge back late 2.0.8 changes from Alan

--HG--
extra : convert_revision : bbe39035b485c7cb3358b874e476c13f63c489e6

asp24/resource-agents,stevenraspudic/resource-agents,stevenraspudic/resource-agents,asp24/resource-agents,stevenraspudic/resource-agents,asp24/resource-agents