JSF 2.2 update and other minor tidyups

Change-Id: I4dade43204d5f3212fdfb10d1e992689513fcf1d