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

Change-Id: I707af99316c7b2c5e8edbd2103c639f313590a8c
Merge "Bug fix for https://bugs.launchpad.net/juniperopenstack/+bug/1344477"