LocaleConverter fix for incomplete locales
Merge remote-tracking branch 'original/master'

Conflicts:
	morphia/src/test/java/org/mongodb/morphia/converters/LocaleConverterTest.java
Updated syntax and tests according to Morphia spec.
Revert "Updated syntax and tests according to Morphia spec."

This reverts commit 6dbccf2e39925ec0b8b95ce8489976b27b619a8d.
Updated syntax and tests according to Morphia spec.
Merge pull request #653 from Eemuli/master

LocaleConverter fix for incomplete locales