Merge pull request #670 from stewart-ibm/ci-improvements-master-next

master->master-next merge + Ci improvements back to master-next