more strong order in Neutron manifests

between keystone roles and inserting 'service' tenant-ID to the neutron config.

Change-Id: I9d6780fe924756643f34a597a1abd9e6189611ee
Closes-bug: #1328462