merge of code pulled from 'dev'
merge of code pulled from 'dev'

--HG--
extra : convert_revision : 1c8f6a5c9da99d966723b5961c709859120fb8b6

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