PMO-2462/PMO-2238: fixing Podra model issues
Merge branch '1.6.x'

Conflicts:
	grails-app/conf/BuildConfig.groovy