master-qa-11412

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