fix vagrant deploy.
fix handling of form provided default values.
Merge branch 'master' into develop