FLEX-33488 - Merge branch 'refs/heads/makeFlexUnitApacheReady' into develop