OH2 Z-Wave refactoring and testing... and SECURITY

Probably in 1 week time. I am away this weekend, so will probably do this late next week.

See also this thread -: