Merge proposals dependent on lp:~pedronis/ubuntu-push/server-tweaks

lp:~pedronis/ubuntu-push/server-tweaks has no merge proposals.