Merge pull request #1 from apache/master

update from apache/incubator-storm
Merge pull request #2 from apache/master

update from apache/incubator-storm
Merge pull request #3 from apache/master

update from apache/incubator-storm
Merge pull request #4 from apache/master

update from apache/incubator-storm
STORM-312 add storm monitor command line tools
Allow users to pass TEST-TIMEOUT-MS as param

It would be nice if `complete-topology` allowed a usere to pass in
the default timeout as a parameter. This PR adds functionality without
breaking any existing code. Tests pass.
seperate out argument parsing in Monitor class; remove 'waiting' status in mertics; add argument -s stream to specify stream
The exception time display as default timezone.

Remove function date-str.
Change the exception time returned as a raw value.
Add moment.js used format timezone.
make topology-name to be an argument; make component-id optional
resolve storm-254, fobbiden to register same name metrics in different timeBucket
correct typo
rm unused :use class; better handling InterruptedException; change MetricState and Poller better fits for Java
Clarify working directory for example commands
STORM-399 update KafkaConfig.maxOffsetBehind default to be Long.MAX_VALUE
Added a hacky workaround for a FileNotFoundException I encountered
while using storm and tika
Modified resource extraction to use getProtocol
Merge branch 'storm-monitor-cmd' of https://github.com/Gvain/incubator-storm into STORM-312

STORM-312: add storm monitor tools to monitor throughtput interactively
Added STORM-312 to changelog and readme.
STORM-403: heartbeats-to-nimbus in supervisor-test failed due to unintentional worker launch
Merge branch 'STORM-312'

Conflicts:
	CHANGELOG.md