Merge "Key{Master,Mint}: stricter parameter checking"