Remove extra comma and use set_fact idiom

The last commit had an errant comma which led to an incorrect
upstart config. Remove the extra comma and use set_fact instead.
attempt to addres xorp failures in CI

For some reason xorp is failing CI, while working locally. Set xorp
service state to restarted and add a sleep of 10 as this service
seems to start slowly sometimes.