Simplify string key based option array merges to + operator for consistency and micro-opt. Also removed dead code.
Re-introduce the removed enabled option for Helper::__get()
Merge pull request #3686 from dereuromark/3.0-merges

3.0 merges simplified