adds lock file
some constraints changes
Fixed branch alias
Merge pull request #133 from blaugueux/patch-1

Fixed branch alias
Merge remote-tracking branch 'remotes/github_upstream/master' into required-roles-in-exception