Merge "comment out testResourceLeakageTest" into jb-mr1-dev