Station name collision fix (closes #1911)
Make the unique name generation a bit easier to understand.
make file-scope functions static
Merge branch 'fix_1911'
Merge remote-tracking branch 'johnbartholomew/mv-multiplicative-zoom'