Fixed bug indirect mapping type display bug

On loading new window mapping type selected in
combo box did not relate to what was shown on UI

Refs #9966
Merge branch 'bugfix/9966_split_direct_and_indirect_interfaces' into develop