master-qa-6068

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