Added support for new ImageServer

Unfortunately we are stuck with 3 switches for a while until this is rolled out, at which point we can delete 2 of them and all the forked code...