added timestamp logic
removed code and logic deprecated by STREAMS-116
Auto-merge | Integrating changes from apache/master