Merge branch 'mg/fix-build-remote-helpers' into maint

* mg/fix-build-remote-helpers: remote-helpers: build in platform independent directory