More code cleanup
Merge branch 'master' of https://github.com/pentaho/metastore

Conflicts:
	ivy.xml