Merge "Merge 'Update ojluni_modify_expectation.py to use 17.0.6 by default' into master"