double commit I17e23731ec165c724b9c3ff612b12f5005fe234f to support heat in ubuntu/juno, these changes are specific to contrail-heat

Change-Id: I2c0b24a8116f3f0ca70e85fc76507e8bfd156d24