Put helper scripts in /usr/bin
(cherry picked from commit 974aa6ae362baf9429d4dd3572ab9a509bbc21b2)