[CB-3822] BB10: correct -p (password) and --pin options