Adding missing use_clock check to getNSecs
Merge branch 'fix-getnsec-simtime' into toolchain-2.6-patched
Merge branch 'toolchain-2.6-patched' into catkin