set env attributes as override instead of default
automatically restart log shipper when it's stuck
Merge branch 'master' into grizzly