Revert "Merge branch 'qa-shl-allow-omnibus-config-to-merge-arrays' into 'master'"
Reverting !1213 (merged) because it broke omnibus-gitlab config. See #717 (closed)
Edited by Mark Lapierre
Reverting !1213 (merged) because it broke omnibus-gitlab config. See #717 (closed)