backport fix for https://bugs.launchpad.net/juniperopenstack/+bug/1330472 to R1.05. Closes-Bug: #1330472

Change-Id: I5d2c688ce8ecafa40deacb34110b8d94d90411dc
Merge "backport fix for https://bugs.launchpad.net/juniperopenstack/+bug/1330472 to R1.05. Closes-Bug: #1330472" into R1.05