changes for authfree pull
Merge branch 'master' of github.com:devtim123/pillar