Merge "add option to specify updater binary, for development"