Release Candidate 2
Merge [TRAFODION-1612] and [TRAFODION-1613] build changes