devops package template added
Merge branch 'master' into devops
rules fix