CB-8202 Fix gradle build signing when passwords provided interactively
Merge branch 'master' into 4.0.x (apk signing with interactive passwords)