Re-work server def header to use enum instead of #defines - fixing duplicate define.
Fix the QAV shaper and ensure high priority queue usage.