master-qa-12487

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