FACES-1706 Upgrade 3.1.x and 2.1.x branches from Liferay Portal 6.1.1 to Liferay Portal 6.1.2 API