master-qa-8597

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