CB-7512 Make key password optional & prompt for it when missing
Merge branch 'master' into 4.0.x (gradle optional password)