Merge proposals dependent on lp://qastaging/~afreiberger/charms/trusty/bootstack-config/update-okcupid-ips

lp://qastaging/~afreiberger/charms/trusty/bootstack-config/update-okcupid-ips has no merge proposals.