master-qa-5002

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