Merge [TRAFODION-1642] PR 209 License fixes into release 1.3 branch