master-qa-4068

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