TMSS-146: merged master into this branch so we're up to date and all tests pass

...include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jCampaign.h

...lude/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jClassifConv.h

...de/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jInitCPPLogger.h

...de/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv.h

.../jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance.h

...de/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv.h

...ude/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv.h

...nclude/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jTreeValue.h

...include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jUnitConv.h

...mFacade/nl_astron_lofar_sas_otb_jparmfacade_jParmFacade.h

...Facade/src/nl_astron_lofar_otb_jparmfacade_jParmFacade.cc

...tor/test/test_regression.in_data/txt/20150713_4C17.31.txt

...est/test_regression.in_data/txt/20150731_G46_run1_HBA.txt

.../test_regression.in_data/txt/B1834620_HBA_LB_20150817.txt

...tor/test/test_regression.in_data/txt/LC4_020_20150813.txt

...st_regression.in_data/txt/LC4_022_3C58_HBA_parameters.txt

...st_regression.in_data/txt/MSSS_20151207_testmultipipe.txt

...enerator/test/test_regression.in_data/txt/Ticket_6923.txt