Restore GLM2 files from master.
Correct merge of H2O & RPC
Add in some other missing stuff that appeared in master.

Runs build.sh tests, minus DdplyTest (big)