fix ios-xr prompt
Merge branch 'master' into cfg_as_object