oops lost some of the imports after merge from jenkinscli repository