Merge "Allow shell to set log.tag.* properties" into nyc-dev