BUG-509: Cleanup datastore switching configuration

This cleans up the configuration, relying on the fact that we can have
the two worlds existing concurrently and only expose one of them.

Change-Id: I9e2c0ecbdce3fb10940e1ff9fb88fc5148b42fc7
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge "BUG-509: Cleanup datastore switching configuration"