sr-41

Fix SF + Apply https://github.com/brianchandotcom/liferay-plugins/pull/2891