master-qa-6494

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