master-qa-9410

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