* Merge from debian unstable (LP: #891248). Remaining changes: - debian/control: add conflicts/replaces for ldirectord. * debian/control: Fix the Conflicts and Replaces lines of resource-agents to make sure that cluster-agents and resource-agents are mutually exclusive. Setting the urgency to high because this bug keeps people from running the whole clusterstack (Closes: #646110) * debian/patches/ocf-asterisk: Include the Asterisk PBX OCF resource agent written by Florian Haas, Andreas Kurz and me, sponsored by hastexo