Fixed migrations

moved machine to machine_model, added migration check to
add_dsconfigad_data