Merge "xsql should pull junit directly"