do not sudo if user is devops
Merge branch 'master' into task6