Bug fix for https://bugs.launchpad.net/juniperopenstack/+bug/1344477

Change-Id: I030721bfe97fd97311e69c6f80d571cab51d78c7

As part of bug fix of https://bugs.launchpad.net/juniperopenstack/+bug/1344476 build was broken. Fixing the build fix.

Change-Id: I48d8a0756d304a0d0cd643f423b62193f18606e1

the config conf files are coming from 2 spec files - removing from contrail-openstack-config pkg

Change-Id: I3f80343e8754967fdde85921433c32f32b9840c3