Update ncs_navigator_configuration to user branch 'issues_16_17_18'.
Merge branch 'feature_3470' into 2.2-3470