Merge branch '6.1.x' into jsf-config-app-servers-6.1.x

Conflicts:
       discover/using-liferay-portal/articles/20-errata/00-errata-for-uusing-liferay-portal-6-1.markdown