Make Image and Flavor params consistent across roles

This should make the Tuskar & TripleO UI work somewhat easier.
Sort the parameter list alphabeticaly