Merge release-5-0 into master

Conflicts:
    src/external/gmock-1.7.0/CMakeLists.txt
        - took both changes on the same line
    src/gromacs/gmxpreprocess/calc_verletbuf.c
        - took both changes on the same line
    src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.cu
        - discarded temporary common.h hack from release-5-0 in favor of
          better solution in master
    src/gromacs/selection/nbsearch.cpp
        - resolved all conflicts in favor of master (were from a
          back-ported change)

Change-Id: I34190b704bcb1c020dcc2a3586a25620fd3c3ccf

diff --cc src/external/gmock-1.7.0/CMakeLists.txt
index c9404bf48be0b3eef9b666d115a8fcbe65910753,c31ccf06877d249fa46135673594ef12ea30d952..b9a0f2aada7b4c3182a86679eea043c33d261234
--- 1/src/external/gmock-1.7.0/CMakeLists.txt
--- 2/src/external/gmock-1.7.0/CMakeLists.txt
+++ b/src/external/gmock-1.7.0/CMakeLists.txt
@@@ -66,8 -68,7 +66,8 @@@ if (HAS_NO_UNUSED_VARIABLE
  endif()
  
  add_library(gmock STATIC ${UNITTEST_TARGET_OPTIONS} ${GMOCK_SOURCES} ${GTEST_SOURCES})
 -set_property(TARGET gmock APPEND PROPERTY COMPILE_DEFINITIONS "${GMOCK_COMPILE_DEFINITIONS};GTEST_CAN_STREAM_RESULTS=0")
 +set_property(TARGET gmock APPEND PROPERTY COMPILE_DEFINITIONS
-              "_GNU_SOURCE=1;${GMOCK_COMPILE_DEFINITIONS}")
++             "_GNU_SOURCE=1;${GMOCK_COMPILE_DEFINITIONS};GTEST_CAN_STREAM_RESULTS=0")
  
  set(GMOCK_LIBRARIES gmock ${PTHREADS_LIBRARIES} PARENT_SCOPE)
  set(GTEST_LIBRARIES ${GMOCK_LIBRARIES} PARENT_SCOPE)

diff --cc src/gromacs/gmxana/gmx_trjconv.c
Simple merge

diff --cc src/gromacs/gmxlib/checkpoint.cpp
Simple merge

diff --cc src/gromacs/gmxpreprocess/calc_verletbuf.c
index 676c8c09d183edf975fd49d496e78ab9392bfeab,45d22062d78ecc9cba98133bc7f8311273daa8a3..5c8329344c8434cb468cda962731219e7d12259e
--- 1/src/gromacs/gmxpreprocess/calc_verletbuf.c
--- 2/src/gromacs/gmxpreprocess/calc_verletbuf.c
+++ b/src/gromacs/gmxpreprocess/calc_verletbuf.c
@@@ -208,8 -207,8 +208,8 @@@ static void get_vsite_masses(const gmx_
              for (i = 0; i < il->nr; i += 1+NRAL(ft))
              {
                  const t_iparams *ip;
-                 real             cam[5] = {0}, inv_mass, m_aj;
-                 int              a1, j, aj, coeff;
 -                real             cam[5], inv_mass, coeff, m_aj;
++                real             cam[5] = {0}, inv_mass, coeff, m_aj;
+                 int              a1, j, aj;
  
                  ip = &ffparams->iparams[il->iatoms[i]];
  

diff --cc src/gromacs/mdlib/sim_util.cpp
Simple merge

diff --cc src/gromacs/selection/nbsearch.cpp
Simple merge