master-qa-5667

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