Merge changes I6643c9ee,Ibd412b26

* changes:
  Make test 1939 not depend on total number of proxies allocated
  Ensure that all StackTrace.java files are identical for CTS