Update pom.xml
Update pom.xml
Update pom.xml
Merge branch 'master' of https://github.com/teiid/teiid-rhq

Conflicts:
	teiid-rhq-plugin/pom.xml