Change Instance to Server to match throughout

Justin Zobelrequested to merge
work/jz/instance-server into master

Merge request reports