.NSLS2: fixing conflict in nsls2.core.feature after merge 

Change-Id: I01b4847b95d9b5cb03defa7b48f3c7c83ffc9d2a
Signed-off-by: Kunal Shroff <shroffk@bnl.gov>