master-qa-9377

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