master-qa-8721

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