SCI-1070: attempt to solve package conflict error
Merge branch 'master' of git@github.com:DawnScience/dawn-common.git