master-qa-6006

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