Replaced refs to server and worker with controller.
Merge pull request #645 from opdemand/deis-controller-refs

Replaced refs to server and worker with controller.