[nasa/Nos3#325 ] Equuleus upgrade

[rjbrown2]

Must review and approve these first:

• [nasa/Nos3#325 ] Equuleus upgrade nasa-itc/cFE#2
• [nasa/Nos3#325 ] Equuleus upgrade nasa-itc/PSP#4
• [nasa/Nos3#325 ] Equuleus upgrade nasa-itc/osal#5

[zlynch2]

Pulled 325, updated submodules, then pulled nos3#325 branch for psp, osal, and cfe.
I checked out in minimal and full s/c config. Things seem to be in order and everything builds ok. Approving.

[rjbrown2]

Mark found that the nos3-mission.xml is still in sc-minimal-config.xml --- Change this back to sc-full-config.xml

[msuder]

Pulled the 325 branch. Updated submodules. Ran minimal and full scenarios and things worked as planned. Approved for merge.

[jlucas9]

Looks good to me! Put in a minor hotfix to resolve 42 IPC conflicts with the thruster and IMU which seem to be from the dev branch and not this work in order to fully verify 42 launching and sun pointing. Confirmed CFDP class 2 also appears to work via test runner.

Just don't forget to close the required submodule merges and update at the nos3 / top level before merging this in!

[msuder]

Approved