Merge branch 'master' into develop
Merge branch 'master' of github.com:cloud66/help into develop
Merge branch 'master' of github.com:cloud66/help into develop
updating customconf patch doc