Fixes #2389 - Authentication failure with cloud-init