master-qa-5686

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