Merge proposals dependent on lp://staging/~aisrael/charms/precise/hacluster/fix-charm-proof-lint-test

lp://staging/~aisrael/charms/precise/hacluster/fix-charm-proof-lint-test has no merge proposals.