completed consolidation of surrogatesolution package (for now)
Authored by: gunfloe 2015-05-22
Parent: [r33218]
Child: [r33220]