Root node selector relocated

The "root" checkbox is now in a individual row between "type" and
"inputs".
Merge branch 'master' into pradeep
Clean up code.  Add comment referencing Bug #2414.