Also, cleanup trailing whitespaces and unused variable.

new_url was not computated correctly either,
giving instance_url//erp5/...