Merge proposals dependent on lp://qastaging/~nskaggs/ubuntu-filemanager-app/fix-xauthority

lp://qastaging/~nskaggs/ubuntu-filemanager-app/fix-xauthority has no merge proposals.