servenv: support for lameduck-period
Merge branch 'master' into monitoring
test env fix