Merged Steve's Controller updates from gerrit back into the backups fork.

Change-Id: Ia608a4968ac464b89e1daf311a54b4e802fca6b5