Moved the vagrant resources setup to "development". Removed unnecessary APPS option
Merge branch 'refs/heads/f/ansible' into r/3.1.x