Ninja-unify 1.1/1.2/2.0 system tests
Ninja-fix 1.2 system tests
Update thrift-generated Constants.java