BZ #1043964 - Fix to move neutron setup after db setup.

https://bugzilla.redhat.com/show_bug.cgi?id=1043964

The 'neutron-db-manage upgrade' command was failing on first runs of puppet
agent due to a race condition where the database was not necessarily created
before this command was run.  The order matters, so we have now specified this
more precisely.

(cherry picked from commit 776c4889ef4eb19bfb4a4692050acda6f0ff2dc9)