Bug 1086854 - Add timeout when locking operations
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