Merge "Add labels for linking in configuration.rst"