First pass at cartridge upgrade scripts and changes to scaling_func_test...

....