Merge branch '1.1' of https://github.com/ClusterLabs/pacemaker into fixes
Conflicts: pengine/container.c