Fix condition type calculation so it reflects FTA's TERM model
Add service life consumed report [fixes #70746452]
Merge branch 'master' of https://github.com/camsys/transam_core