Isolate CLI integration tests from any settings decryption failures
Merge branch '1.1.x'