Hg: Merge with upstream
Hg: Merge with upstream

--HG--
extra : convert_revision : 648ed19f6d12b9bb081022dfd483c67d42a59cc1

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