master-qa-5697

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