Added return CdiConfiguration new config calls

Formatted File and added return CdiConfiguration to match rest of
configuration setters.