Copy of branch AMM15_v3_6_STABLE_package_collate_bgc_diagnostics plus some fixes to merge observation branch