Merge "Get rid of zergrush reflection test" into jb-dev