CB-7512 Make key password optional & prompt for it when missing