master-qa-6632

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