master-qa-6230

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