CIMI: nits to fix failing cimi black-box tests for release 1.1.1