Merge "Add NamespaceRestriction class so that BlockRestriction can handle namespaces."