master-qa-9091

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