neutron + gre fix

Change-Id: I3bd6650bb0720ab4aa77bb99b00025db3efe02f5