master-qa-4010

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