master-qa-12668

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