Order the snf-mkimage input arguments

Order the arguments alphabetically.
Merge the image and the OSBase metadata dicts