FACES-1487
Upgrade all demo portlets to Mojarra 2.1.20 except for ICEfaces portlet demos
(keeping Mojarra 2.2.0-SNAPSHOT but keeping ICEfaces at 2.1.6 for now)