Merge "Partially revert removal of time.sleep if v3 auth enabled in conf."