Kracoeus 7718

this PR fixes several bugs and an improper import statement.
That is weird. Can we just change the getter to call getS2sOpportunity.getS2sOppForms? Seems unnecessary to map it in both locations.