Fixes naming issue with the data storem anager in GrandMessageHandler.
Adds a space after if.
Fixes more naming issues.
Merge branch 'feature/add-idatastore-manager' into feature/add-reply-functionality