[BISERVER-10889] Restructure import handler construction/injection.  Cha...

...nge file never made it to commit.