Merge "Use keystone session with heatclient in integration tests" into mcp/pike