master-qa-5010

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