Double commit for 1352460 in mainline.
https://bugs.launchpad.net/juniperopenstack/+bug/1352460

Change-Id: I6dcfddadb31233bc81a8d55463755e193ce7e445
Merge "Double commit for 1352460 in mainline. https://bugs.launchpad.net/juniperopenstack/+bug/1352460"