master-qa-6324

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