Merge remote branch 'upstream/master' into bugfixes
Merge remote branch 'upstream/master' into bugfixes
Fix ra_management and ndproxy_routing config overwrite

Set default values for the ra_management and ndproxy_routing
config parameters if no attributes are present and overwrite is
to true.
Merge branch 'bugfixes'