Merge "Add -DWIN32_LEAN_AND_MEAN build flag to get rid of winsock2.h warnings" into lmp-mr1-dev