master-qa-12490

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