Merge "Revert "Fix rtd verify job choosing strategy""