enabling facts back and fixing them
migrating to persisting instance-id directly
more steps in moving to instance id persistency within systme
aws full scenario now works