A couple of minor bug fixes

Signed-off-by: Kai Kreuzer <kai@openhab.org>
Merge branch 'master' of https://github.com/eclipse/smarthome into thing-dsl