update colvars to another set of changes from the upstream repo
(cherry picked from commit cb816f8cba630e27df773b54a584b72741fa20db)