master-qa-6314

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