forward port of adjustments for jsf2-login-portlet demo for 3.0.x-legacy...

... branch