Fix scanner regex in MockBase and simplify it a little
Fix left over System.out.println in Annotation.java
TestTsdbQuery.java
Add TestTsdbQuery.java to Makefile