Merge branch 'release/2.0' into develop
Fixing vagrant salt config path
Merge branch 'develop'