master-qa-12217

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