Rename RSTP -> STP for RSTP and MST options
Merge branch 'master' of github.com:opensolutions/NOCtools