Merge "Add heat api gabbits tests to smoke" into mcp/xenial/rocky