Merge OpenHIM 2.0 release into master