Merge proposals dependent on lp://qastaging/~mbruzek/charms/trusty/wildfly-ha-master/fixes

lp://qastaging/~mbruzek/charms/trusty/wildfly-ha-master/fixes has no merge proposals.