[base] TokenShaper: minor incremental improvements
debian: fixes to upstart script