FACES-1459 Support for JSF 2.2 (minimize diffs across branches -- JSF 2.2 Flash related fixes)