Move file injection setting to the right place

The nova code was wiping nova.conf after our iniset :(.

Change-Id: Ib618da1bd21da09f8855ec4691bff79c4c3b3d9c
Merge "Move file injection setting to the right place"
Merge branch 'master' of github.com:openstack-dev/devstack