Fixes for CLI foreman tests

This PR addresses all errors listed on run #111 of nightly automation.