Fix per service option parsing.

* None is being passed as a string. Replace with explicit ''
* Fix typo with autorestart preventing its use
Ugh. Hateful.

Would it be a pain of me to ask for some kitchen tests of this? (serious question. Should we do that here/now or should we do that as a separate PR)