[VirtualBox/el7] (14 commits) ...Merge branch 'master' into el7