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

Change-Id: Iadb153bdd9ffd7444126c961408e61de30ec17e0
Merge "Changes for bug fix https://bugs.launchpad.net/juniperopenstack/+bug/1344476"