After improvements to key handling in T12608, the --master flag is probably (?) no longer ever useful, and should be removed. --user and --identity replace it.