Merge changes Ief9dff7d,I5e2ca73d

* changes:
  Fix a tidy warning: performance-unnecessary-value-param
  Delete leftover makefile fragment: server/CleanSpec.mk