Ignore ~ backup files
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Added Apache License Header for Puppet related files