refactor devstack script, remove neotron patch (which is merged)