Hi Matt,
so from laforge/wip, the only problematic bit I could find is https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/19808/1
It would be appreciated if you could take that patch and extend it as described in the review comment. Once the application can specifiy that IPA CCM option list, we can merge the patch and then subsequently modify osmo_diameter2gsup to use the master branch (and that new function to specify the MME-00.... IPA CCM option).
Whatever other changes you may have, please submit them to gerrit to the respective repository. osmo_gsup, osmo_ss7 and osmo_diameter2gsup are luckily all using gerrit + jenkins verification these days.