cmake: updated GnuradioConfig.cmake file to look for headers installed in 3.6.
Merge branch 'master' into next

Conflicts and updated for 3.7 changes:
	cmake/Modules/GnuradioConfig.cmake