Merging changes for 1.7.0 release
Merging changes for 1.7.0 release

University-of-Auckland/rapidconnect,University-of-Auckland/rapidconnect,ausaccessfed/rapidconnect,ausaccessfed/rapidconnect,ausaccessfed/rapidconnect,University-of-Auckland/rapidconnect,University-of-Auckland/rapidconnect,ausaccessfed/rapidconnect