[golang/epel7] (2 commits) ...Merge branch 'master' into epel7

[Vincent Batts]

Summary of changes:

  25b1d04... skip flaky test (*)
  a9a1e21... Merge branch 'master' into epel7

(*) This commit already existed in another branch; no separate mail sent