master-qa-11417

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