More work getting this adapter ready
Merge branch 'feature/0.9.8' of https://github.com/snowplow/snowplow into feature/0.9.8