Fix SCPS configuration
Fixed SCPS configuration by adding Solicitation/SolCaps to the ORM session from inside the config service so they have IDs before SCPS are created. Adjusted tests to handle IDs referenced by the SCPSs returned by the service.
Fixed SCPS configuration by adding Solicitation/SolCaps to the ORM session from inside the config service so they have IDs before SCPS are created. Adjusted tests to handle IDs referenced by the SCPSs returned by the service.