fixed merge issue with liferay-plugin-package.properties