master-qa-6340

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