Merge branch 'gc/bare-repo-discovery'

Allow configuration files in "protected" scopes to include other configuration files. * gc/bare-repo-discovery: config: respect includes in protected config