Merge release-4-5-patches into release-4-6

Change-Id: I5a7f695d49e3b7d1a5b4a0aeb099e5d3cc100faa

diff --cc cmake/gmxCFlags.cmake
Simple merge

diff --cc share/html/online/mdp_opt.html
Simple merge

diff --cc src/gmxlib/checkpoint.c
Simple merge

diff --cc src/gmxlib/gmxfio.c
Simple merge

diff --cc src/gmxlib/wman.c
Simple merge

diff --cc src/kernel/gmxcheck.c
Simple merge

diff --cc src/kernel/md.c
Simple merge

diff --cc src/kernel/md_openmm.c
Simple merge

diff --cc src/kernel/mdrun.c
Simple merge

diff --cc src/mdlib/domdec.c
Simple merge

diff --cc src/tools/gmx_anaeig.c
Simple merge

diff --cc src/tools/gmx_chi.c
Simple merge

diff --cc src/tools/gmx_cluster.c
Simple merge

diff --cc src/tools/gmx_current.c
Simple merge

diff --cc src/tools/gmx_density.c
Simple merge

diff --cc src/tools/gmx_editconf.c
Simple merge

diff --cc src/tools/gmx_enemat.c
Simple merge

diff --cc src/tools/gmx_genbox.c
Simple merge

diff --cc src/tools/gmx_genpr.c
Simple merge

diff --cc src/tools/gmx_h2order.c
Simple merge

diff --cc src/tools/gmx_helix.c
Simple merge

diff --cc src/tools/gmx_membed.c
Simple merge

diff --cc src/tools/gmx_order.c
Simple merge

diff --cc src/tools/gmx_potential.c
Simple merge

diff --cc src/tools/gmx_spatial.c
Simple merge

diff --cc src/tools/gmx_tcaf.c
Simple merge

diff --cc src/tools/gmx_tune_pme.c
Simple merge

diff --cc src/tools/mk_angndx.c
Simple merge