neutron + gre fix

Change-Id: If0021bfee151e840f40094596ee763e26962b443