Merge "Mising CLI test for Keystone"