Merge proposals dependent on lp://staging/~evfool/pantheon-files/lp1400735-hide-smb-port

lp://staging/~evfool/pantheon-files/lp1400735-hide-smb-port has no merge proposals.