Merge "Fixing ImagesOneServerTestXml issue"