CommonDatastore is used in service, not in controllers

Signed-off-by: Martin Bobak <martin.bobak@gmail.com>
common datastore related changes

Signed-off-by: Martin Bobak <martin.bobak@gmail.com>