master-qa-6560

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