Make neutron user admin in service tenant and small bug fix

Change-Id: Ie14134761fae7bdf58033de51eb3250404bbfe05