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

Change-Id: I8ab65417e11820ac987befe4edda0e602a2bc25a