FACES-1796 fix-versions.pl now handles fixes for the new schema location needed in the faces-config.xml
FACES-1459 Support for JSF 2.2 (minimize diffs across branches)
FACES-1769 adjusted signin context and default webContext
FACES-1459 Support for JSF 2.2 (minimize diffs across branches)
FACES-1793
LiferayURLGeneratorBaseImpl.generateURL() does not handle certain parameters generated by PortletURLImpl.generateToString()
FACES-1800 Update settings.xml with liferay-public repository URL for repository.liferay.com
FACES-1531 Develop new 4.1.x branch with compatibility for JSF 2.2 + Liferay Portal 6.1 (JSF 2.2 requires from-view-id)
FACES-1793 LiferayURLGeneratorBaseImpl.generateURL() does not handle certain parameters generated by PortletURLImpl.generateToString()
empty commit to fix bogus git merge error message
FACES-1796 Enable fix-versions.pl script to update the XML schema location inside faces-config.xml descriptors