master-qa-12267

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