master-qa-8071-1

http://issues.liferay.com/browse/LIFERAYQA-8071-1