blocks: QA doesn't need this header (fixed on next already).
Merge branch 'master' into next

Conflicts:
	gr-blocks/lib/qa_block_tags.cc