Revert "- Patch #1479652 by Psikik: convert image style config filenames/keys from plural to singular." This reverts commit 854ad211.