FACES-1555
IllegalStateException when clicking on "Edit Preferences" button of jsf2-cdi-portlet
Merge branch '3.1.x' into testing