master-qa-12216

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