Apply, rework and cleanup second part of patch from Marco Ceci to fix 354421
Apply, rework and cleanup second part of patch from Marco Ceci to fix 354421

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