fix defaultContainer deprecation warnings.
Merge pull request #2600 from stefanpenner/fixup_deprecation_warnings

fix defaultContainer deprecation warnings.