master-qa-6410

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