changes db prefixes
Merge remote-tracking branch 'remotes/origin/2.3'

Conflicts:
	Resources/config/propel/schema.module.xml
	Resources/config/propel/schema.xml