CLI: Move configuration override to node-configuration

Closes gh-823