Current platform implementation in globals_s390.hpp uses regular product flags for everything.
These platform specific flags were never intended for official support. They are only there to diagnose issues and find workarounds.
Change flag kind to "diagnostic".
Change these flags from regular product to diagnostic: