Fixed merge conflict
updated package dependency versions
Merge branch 'master' of https://github.com/condep/condep-dsl-operations-aws
Added missing license