Moved the setting up of forwarding local changes to be the first part of
creation in new instance factory 2.

Signed-off-by: Jakob Brandsborg Ehmsen <jakobehmsen.github@gmail.com>