Merge "Add client IP into Keystone API log"