Merge proposals dependent on lp://qastaging/~brad-marshall/charms/trusty/postgresql/add-nagios_hostname_type

lp://qastaging/~brad-marshall/charms/trusty/postgresql/add-nagios_hostname_type has no merge proposals.