ws and other non-functional changes
Change build-info scope to compile
Merge branch 'master' into rc2_dev

Conflicts:
	grails-app/conf/BuildConfig.groovy