master-qa-4069

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