CSPACE-5678-D: Additional service binding generation bug fixes.
CSPACE-5678-D: More service binding generation bug fixes.