Added fix for missing imgadm directory
Improved imgadm handling at install time.
Merge branch 'test' into dev