modtool: fixed order for both 3.6 and 3.7 API versions
Merge branch 'master' of git://github.com/gnuradio/gnuradio into grmodtool
howto: copies Doxyxml from main docs to properly pull out block parameters documentation.
GRC: adds ability for grc to pull in documentation for blocks from other GR modules.
Merge branch 'maint'
Merge branch 'master' into next
core: prefs updated to handle cases of env var delared properly.
ctrlport: adding a config param to enable/disable controlport, default=disabled.

Also updates QA code for ctrlport to turn controlport on via env var.
ctrlport: using prefs files to configure ctrlport.

Prefs file points to ctrlport config file and uses it to set the properties.
core: use prefs file to enable/disable ctrlport export of perf. counters.
docs: adding an exclude rule for gr-modtool to avoid conflicts.
core: prefs setup looks for a local .gnuradio/config.conf to use.

Order of precedence:
env. vars -> .gnuradio/config.conf -> ${prefix}/etc/gnuradio/conf.d/*
docs: adding an exclude rule for gr-modtool to avoid conflicts.
docs: correcting gr-modtool exclude path for master dir format.
core: prefs setup looks for a local .gnuradio/config.conf to use.

Order of precedence:
env. vars -> .gnuradio/config.conf -> ${prefix}/etc/gnuradio/conf.d/*
Merge branch 'master' into next

Conflicts:
	docs/doxygen/Doxyfile.in
core: removed vestigial debug line.
core: removed vestigial debug line.
Merge branch 'master' into next
uhd: converted gr-uhd to v3.7 style.