Merge remote-tracking branch 'origin/feature/12409-improved-vagrant-base-box-versioning' into stable Fix-committed: #12409