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

Change-Id: I030721bfe97fd97311e69c6f80d571cab51d78c7