Added vivid support for upstart flavor