master-qa-12488

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