master-qa-9209

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