master-qa-6477

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