Merge commit 'astyle-v2.3~1' into v2.3-maxent

...macs-2016.3.diff/src/gromacs/mdlib/minimize.cpp.preplumed

patches/gromacs-2016.3.diff/src/programs/mdrun/md.cpp

...s/gromacs-2016.3.diff/src/programs/mdrun/md.cpp.preplumed

patches/gromacs-2016.3.diff/src/programs/mdrun/mdrun.cpp

...romacs-2016.3.diff/src/programs/mdrun/mdrun.cpp.preplumed

patches/gromacs-2016.3.diff/src/programs/mdrun/repl_ex.cpp

...macs-2016.3.diff/src/programs/mdrun/repl_ex.cpp.preplumed

patches/gromacs-2016.3.diff/src/programs/mdrun/runner.cpp

...omacs-2016.3.diff/src/programs/mdrun/runner.cpp.preplumed

patches/lammps-6Apr13/fix_plumed.cpp

regtest/adjmat/rt-dfg-wcsurf/plumed.dat

regtest/basic/rt-ermsd/der.reference

regtest/basic/rt-ermsd/plumed.dat

regtest/basic/rt-hrex-0/out.reference

regtest/basic/rt-hrex-1/out.reference

regtest/basic/rt-hrex-2/out.reference

regtest/basic/rt-hrex-3/Makefile

regtest/basic/rt-hrex-3/config

regtest/basic/rt-hrex-3/out.reference

regtest/basic/rt-hrex-3/processed.top