Fixes for the inclusion of the ddsc-site api.
Checkout follows trunk.