Fixed image version detection ot work with 14.* images.
Some cleanup.
Lots of cleanup and move to fifo_dt.
merge.