Merge "Add ability to specify docker image for CIS"