Updating css demo to handle case of style natively being stored in css.

Fixes GEOS-6669. Backport of #736.
Removing manual formatChoice procesing during validation. Fixes GEOS-6666.