Handle dictionary configuration element suffixes

 * See LT-12831.

Change-Id: I4f9fe2670b2837778d670d682df22d326d6bcf21