Fix order of checking ICU options in initdb and create database

Applying: Fix encoding check in initdb when the option --icu-locale is not used
Using index info to reconstruct a base tree...
M	src/bin/initdb/initdb.c
M	src/bin/initdb/t/001_initdb.pl
M	src/bin/scripts/t/020_createdb.pl
Falling back to patching base and 3-way merge...
Auto-merging src/bin/scripts/t/020_createdb.pl
CONFLICT (content): Merge conflict in src/bin/scripts/t/020_createdb.pl
Auto-merging src/bin/initdb/t/001_initdb.pl
CONFLICT (content): Merge conflict in src/bin/initdb/t/001_initdb.pl
Auto-merging src/bin/initdb/initdb.c
CONFLICT (content): Merge conflict in src/bin/initdb/initdb.c
Patch failed at 0001 Fix encoding check in initdb when the option --icu-locale is not used

error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"