Merge proposals dependent on lp://staging/~jeremywootten/pantheon-files/fix-debian-build

lp://staging/~jeremywootten/pantheon-files/fix-debian-build has no merge proposals.