STREAMS-216 | Updated the broadcast object to contain a streams ID which will make it easier to identify which Stream the beans belong to
Merge branch 'master' into STREAMS-216
Merge branch 'master' into STREAMS-216

Conflicts:
	streams-monitoring/src/main/java/org/apache/streams/monitoring/tasks/BroadcastMonitorThread.java
	streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/builders/LocalStreamBuilder.java
STREAMS-216 | All JMX monitoring beans now include identifying information and the time that the stream was started
Merge pull request #13 from apache/master

Merge Apache Master 2014/11/17
STREAMS-223 | Fixing faulty if statement logic that was causing NPEs when stream config objects were not explicitly set
Fixed Google+ client connection issues. Wrong credentials were being provided
Removed commented out code
These classes were deleted prematurely, causing unnecessary breaking changes.  They should deprecated as part of STREAMS-218 and deleted in the next minor version.
STREAMS-216 | Fixed unit tests and hardened LocalStreamBuilder, BaseStreamsTask, and BroadcastMonitorThread against NPEs
this configuration file moved
resolves STREAMS-227
Added param constructors to GPlus providers
Merge branch 'STREAMS-216'
Merge remote-tracking branch 'robdouglas/STREAMS-216'
Merge commit '2f11ad004cb199096457f1c29710498fab426566'
Merge branch 'STREAMS-227'
Merge branch 'STREAMS-215.2'
STREAMS-216 | Fixed test errors
Merge remote-tracking branch 'robdouglas/STREAMS-216'