master-ll-7

http://issues.liferay.com/browse/LIFERAYQA-5060