Bug 1086854 - Add timeout when locking operations
remote-user auth plugin: Rely on 'user_action_log_identity_id' for username when trusted header is missing until BZ 1086910 is fixed
Merge pull request #5250 from pravisankar/dev/ravi/workaround-remote-user-auth

Merged by openshift-bot
Bug 1086263 - oo-analytics-export will include applications 'owner_id' field
Merge pull request #5248 from jwhonce/bug/1086854

Merged by openshift-bot
Merge pull request #5252 from pravisankar/dev/ravi/bug-1086263

Merged by openshift-bot
Fix typo
Fix formatting
BZ1083475 - HA scalable application DNS is not deleted after app is destroyed
Merge pull request #5240 from calfonso/bz1083475

Merged by openshift-bot
BZ1086104 - oo-accept-node needs to read tc setting from node.conf

* It throws error message "TC htb qdisc not configured" when run oo-accept-node
due to TRAFFIC_CONTROL_ENABLED=false by default in /etc/openshift/node.conf
Merge pull request #5254 from calfonso/bz1086104

Merged by openshift-bot
Fix formatting
Merge pull request #5255 from danmcp/master

Merged by openshift-bot