Merge proposals dependent on lp:~tvansteenburgh/charms/trusty/wildfly-ha-master/cleanups

lp:~tvansteenburgh/charms/trusty/wildfly-ha-master/cleanups has no merge proposals.