Merge branch release-2016

Merge branch release-2016

 Conflicts:
 cmake/gmxVersionInfo.cmake

Trivial change to version status, resolve as in master

        src/gromacs/hardware/detecthardware.cpp

New logic for hwloc caching clashed with new logging interface.

    src/gromacs/hardware/hardwaretopology.cpp

New field isThisSystem_ was being initialized alongside other fields
that are now initialized elsewhere by the mockable interface.

     src/gromacs/mdlib/forcerec.cpp

Fix for tabulated bonded, and MD logging interface change both
touched init_forcerec.

Change-Id: Ied02b04c0985b5b956af7d46530e04cf51ef1648