Merge "Change mini-keyctl command format."