Merge "[py35] Fixes to get more tempest tests working"