Updated so that works with TM2 path for bundle support and also TM_SUPPORT_PATH can be set from users ENV.