Added generic es feature
Added fix for es feature
Commented stratos features
updating generic es feature pom
Corrected p2.inf to reflect feature
Merge branch 'greg-changes-store-feature' into greg-changes-master