master-qa-6540

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