master-qa-11214

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