This is not dependant on if we are running a regular or an upgrade job. Move the code to a more logical location. Change-Id: Ibdb29a679504ce30bcdc7591b8e68c054dbea580