FACES-1646 Upgrade faces-config.xml descriptors to JSF 2.1