provider now checks for FieldSetNamespaceFromToken being true before prepending token namespace

provider now checks for FieldSetNamespaceFromToken being true before prepending token namespace #6803