FACES-1487
Upgrade all demo portlets to Mojarra 2.1.21