Merge pull request #84 from robdouglas/w2o-master

W2o master
Merge pull request #85 from robdouglas/w2o-master

W2o master
Merge pull request #86 from robdouglas/w2o-master

Fixed dependency version mismatches
Auto-merge | Integrating changes from apache/master
STREAMS-252 | Fixing NPE issue causing Stream to drop datum in certain circumstances
STREAMS-252 | Added more logging
Merge commit '7f69bd4507e4d6caa0de16c7a7a7c2faf52e7b64' into w2o-master-conflicts

Conflicts:
	streams-monitoring/src/main/java/org/apache/streams/monitoring/tasks/BroadcastMonitorThread.java
Merge pull request #87 from w2ogroup/w2o-master-conflicts

Fix conflicts between apache:master and w2ogroup:master
[artifactory-release] Next development version
Merge branch 'w2o-master' into build-fix

Conflicts:
	streams-contrib/pom.xml
	streams-contrib/streams-provider-datasift/pom.xml