NO-JIRA: Sync downstream with the latest changes in upstream#50
Closed
harche wants to merge 11 commits intoopenshift:mainfrom 
Closed
NO-JIRA: Sync downstream with the latest changes in upstream#50harche wants to merge 11 commits intoopenshift:mainfrom 
harche wants to merge 11 commits intoopenshift:mainfrom