Merge branch 'master' (early part) into 3.5.x
Merge branch 'master' into 3.5.x

Conflicts:
	src/main/resources/META-INF/resources/primefaces/tabview/tabview.js
Tagged 3.5.4-UR (Unofficial Release).
Next maintenance iteration for 3.5.x