Don't fail hard when settings.xml can't be decrypted by the CLI
Merge branch '1.1.x'