Updating upgrade scripts names to make sure they are executed in the correct order (merge from trunk)