Removing manual formatChoice procesing during validation. Fixes GEOS-6666.
Merge pull request #735 from jdeolive/style-validate

Removing manual formatChoice procesing during validation. Fixes GEOS-6666.