Merge pull request #1 from andreessen/6.1.x

Due to service-builder issue http://issues.liferay.com/browse/LPS-29668
Switched to use improved version of portal-impl-emdev