Fixing - https://bugs.launchpad.net/juniperopenstack/+bug/1371436

Change-Id: If57aed5cc78062cf8b7be46e8b0f3a0c1192b9d9
Merge "Fixing - https://bugs.launchpad.net/juniperopenstack/+bug/1371436"