[PDI-8288] Cleanup and fix for versioning flag after testing with Spoon