Fix the ordering of the migrations

This MR set adding the configuration custom fields to the currently last migration as all the other migrations come from earlier merges.