package renaming
Merge branch 'master' into porting

Conflicts:
	base/src/main/resources/META-INF/faces-config.xml