FACES-1488
Upgrade ICEfaces demo portlets from ICEfaces 3.1.0 to ICEfaces 3.2.0
FACES-1495
Upgrade PrimeFaces demo portlets from PrimeFaces 3.3 to PrimeFaces 3.5
FACES-1512
Missing JSF 2.0 method overrides in ViewDeclarationLanguageWrapper
FACES-1486
Upgrade to JSF 2.1 API
Merge branch '3.1.x' into testing