Added fix for lifecycle module not appearing in the feature import def
Merge remote-tracking branch 'upstream/master'
Add license text