master-qa-12598

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