master-qa-8070

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