Changing TopicAutoCreation to Use Container

Fixes issue #118
added null ref guard in case someone instantiated this class manually
Merge branch 'hotfix-5.1.1'