1) Add unit test for NoSuchElementException as seen by Pablo.
2) Fix unit test
Merge branch 'master' of github.com:metamx/druid