[Yaml] fixed wrong merge (indentation default is 4 as of 2.1)
Merge branch '2.1'

* 2.1:
  [Yaml] fixed wrong merge (indentation default is 4 as of 2.1)
  Fixed missing class argument when throwing exception