FACES-1645-2.1.x

FACES-1645
Ensure that faces-config.xml descriptors have uniform attribute ordering