Regenerated solutions for chunking unit tests that failed on jenkins
Chunk 22 was actually supposed to be part of chunk 21.  Combined.  Some superficial naming changes to test 19.
Added propose operator to template test for debugging
Merge branch '9.5' into 9.5-unification-bug

* 9.5:
  Added propose operator to template test for debugging
  Chunk 22 was actually supposed to be part of chunk 21.  Combined.  Some superficial naming changes to test 19.
  Regenerated solutions for chunking unit tests that failed on jenkins
Removed unnecessary update_gid function