Initial checkin of neutron patch #4 for devstack