Added retry mechanism for images.
Fixed bug with giving static ip/hostnames.
Merge branch 'test' into dev