Merge branch 'STREAMS-252' into w2o-master

Conflicts:
	streams-monitoring/src/main/java/org/apache/streams/monitoring/tasks/BroadcastMonitorThread.java
Fixed build issues related to LinkResovler and LinkDetails being out of date
Merge branch 'w2o-master' into build-fix

Conflicts:
	streams-contrib/pom.xml
	streams-contrib/streams-provider-datasift/pom.xml
Took out accidentally committed files
Fixed test
Fixed pom issues
Merge pull request #88 from robdouglas/build-fix

Build fix