router.deis./ssl.enforce annotation not persisted on service creation

If somehow a service is to get deleted, when the controller recreates that service the router.deis./ssl.enforce does not get set to match the state in the database.

To reproduce, I had an app with tls:enable set and deleted the namespace. I restarted the controller to force the app to be re-created and then ran the following:

$ deis tls:info -a test-app
=== test-app TLS
HTTPS Enforced: true

$ kubectl get service -n test-app -o json | grep enforce

$ deis tls:enable -a test-app
Enabling https-only requests for test-app... Error: Unknown Error (409): {"detail":"mattk42 changed nothing"}

$ deis tls:disable -a test-app
Disabling https-only requests for test-app... done

$ deis tls:enable -a test-app
Enabling https-only requests for test-app... done

$ kubectl get service -n test-app -o json | grep enforce
                    "router.deis.io/ssl.enforce": "True"

deis / controller

router.deis./ssl.enforce annotation not persisted on service creation #1304