More mount trickery.
Merge branch 'gitlab-shell_vagrant-fixup' into gitlab-shell_vagrant-fixup_for-error_log