Merge proposals dependent on lp:~rockstar/loggerhead/config-cleanup

lp:~rockstar/loggerhead/config-cleanup has no merge proposals.