Bugfix: Some instances had old users information

Updated the imaging code to catch these problems. Some Openstack images
will need to be updated.