Fixed merge issue for rbnks/STREAMS-121
Merge branch 'instagram'
Auto-merge | Integrating changes from apache/master
Auto-merge | Reset versions