master-qa-5785

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