Revert "Trimmed the branch to only the rostime sub directory"

This reverts commit 7b6b1c294736f5b1b1b8c053ec69ed70ed27490b.
Rebase from 'upstream' @ version '0.3.12'
Trimmed the branch to only the rostime sub directory