Revert "Merge branch 'integration' of /home/pfrommer/Documents/openhab into integration"

This reverts commit c0e5fc2e911e00b30b0d2d06a5db82a3799d8030, reversing
changes made to 8dbb75484480c4f022e467a699adce7452021956.