Merge proposals dependent on lp:~geethas1/charms/trusty/was-base/wasbase-fix

lp:~geethas1/charms/trusty/was-base/wasbase-fix has no merge proposals.