Fix bad merge with openhab trunk