fix #3600: false positive lint warnings

There is now a "local-patches" file in place where necessary
adjustments can be done.
Fix lint warning by running local-patches