NSLS2: updating feature order to fix build

Change-Id: I3c632e0cfc1ae2d07060dd8e8d3f0e2fe284f609