master-qa-5022

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