Base: Improve and consolidate OS detection
Base: Improve and consolidate OS detection

PeteBa/OpenSprinkler-App,OpenSprinkler/OpenSprinkler-App,OpenSprinkler/OpenSprinkler-App,OpenSprinkler/OpenSprinkler-App,PeteBa/OpenSprinkler-App,PeteBa/OpenSprinkler-App