Update to liferay-maven-plugin and liferay 6.1.1