Merge branch '3.15' into 7.0

* 3.15:
  minor epicsTimerTest
  epicsTimerTest loosen test threshold
  debug epicsTimerTest
  posix/epicsMath.h
  Revert "libcom: fix colliding isnan/isinf between C99 and C++0x for gcc-4"
  Revert "libcom: properly declare isnan() in C++ code"
  travis-ci /etc/hosts workaround
  redo travis-ci with matrix
  epicsSockResolveTest add detail
  libcom: properly declare isnan() in C++ code
  libcom: fix colliding isnan/isinf between C99 and C++0x for gcc-4
  libcom: import some C99 math (isnan etc.) into global namespace

# Conflicts:
#	.travis.yml
#	ci/travis-prepare.sh

modules/libcom/src/osi/os/posix/epicsMath.h

@@ -14,6 +14,16 @@
 #include <shareLib.h>
 
 #ifdef __cplusplus
+
+#if __cplusplus>=201103L
+#include <cmath>
+
+using std::isfinite;
+using std::isinf;
+using std::isnan;
+using std::isnormal;
+#endif
+
 extern "C" {
 #endif