Cleanup for merge
Cleanup for merge

watou/openhab,juri8/openhab,computergeek1507/openhab,ssalonen/openhab,TheNetStriker/openhab,ssalonen/openhab,idserda/openhab,juri8/openhab,watou/openhab,idserda/openhab,computergeek1507/openhab,TheNetStriker/openhab,ssalonen/openhab,juri8/openhab,watou/openhab,computergeek1507/openhab,computergeek1507/openhab,watou/openhab,computergeek1507/openhab,juri8/openhab,ssalonen/openhab,openhab/openhab,TheNetStriker/openhab,openhab/openhab,idserda/openhab,watou/openhab,openhab/openhab,ssalonen/openhab,juri8/openhab,computergeek1507/openhab,ssalonen/openhab,idserda/openhab,watou/openhab,TheNetStriker/openhab,TheNetStriker/openhab,idserda/openhab,juri8/openhab,openhab/openhab,juri8/openhab,watou/openhab,idserda/openhab,TheNetStriker/openhab,TheNetStriker/openhab,openhab/openhab,openhab/openhab