Redmine #692 (rebased 2)

[Tomas Sedovic]

This fixes the tastk #692.

Since this changed things in the factory and condor interfaces, please make
sure that you do a full end-end testing (building a new image, uploading it to
the cloud and starting an instance) when reviewing this.