Fixed a few bugs in regtests
Merge branch 'master' of github.com:plumed/plumed2