Puppet node definitions restructured
Merge branch 'master' of github.com:apache/stratos