Revert bad merge of repository settings
Cherry pick null value fix on exception creation
Merge branch 'develop'
Pull bugfix from ngriso
Added artifactory repo for deploy