correct the state field setting of Japan.

States file of JP.php has existed. So please delete this line.
Merge pull request #4441 from shoheitanaka/patch-6

correct the state field setting of Japan.
wordwrap #4397
Prevent settings loading twice
version compare needs this to function
Correct do_action arguments fix for #4359

Reverts db9d3ff0b796051b1b2629442681f99ae2493612 partially