Backport of password based CMS support from HEAD.