Merge branch 'dt-dev' into couchbase

Conflicts:
	benchmark/pom.xml
	contrib/pom.xml
Merge branch 'couchbase' of github.com:pm48/Malhar into couchbase

Conflicts:
	benchmark/pom.xml
	contrib/pom.xml
	contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBaseStore.java