Incorporate patch from 165447
Incorporate patch from 165447

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