bugfix: only create dict key if value is not empty
Merge pull request #15296 from basepi/bp-15276

Backport #15276 to 2014.7