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

Change-Id: Ib4bed3478a115841a633a5b5fc81ffcc3c3ccf34