master-qa-9704

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