master-qa-12486

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