uhd: squashed per-channel stream support
some omissions from orig. buspot delivery
indent error fix
volk: fix some ARM test functions that resulted in an infinite loop on some processors.
Merge branch 'maint'
ctrlport: Improved display handling for gr-ctrlport-monitor.
ctrlport: removed 'New Plot' toolbar button. Needs work to be useful and was actually broken.