master-qa-9116

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