largely fixed.
Merge branch 'master' into working

Conflicts:
	streams-runtimes/streams-runtime-threaded/src/main/java/org/apache/streams/builders/threaded/ThreadedStreamBuilder.java
	streams-runtimes/streams-runtime-threaded/src/main/java/org/apache/streams/builders/threaded/ThreadingController.java