WFH commit
Merge origin/davetest into davetest

Conflicts:
	src/main/java/com/openhouseautomation/Convutils.java
	src/main/java/com/openhouseautomation/model/DatastoreConfig.java