[OEM-244] - vagrant changes on g2
Merge branch 'feature/glaucoma-2.1' into jira/4745