master-qa-12534

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