bug fix and test for time boundary
bunch of issue fixes
Merge branch 'master' into batch-zk

Conflicts:
	client/src/main/java/com/metamx/druid/QueryableNode.java