Chief adviser to advisor

Roger Feeserequested to merge
chief-adviser-to-advisor into master

Adding changes to accomodate change from CHIEF ADVISOR to ADVISOR.

Merge request reports