[Yaml] Fix comment containing a colon on a scalar line being parsed as a hash.
Merge branch '2.2' into 2.3

* 2.2:
  [Routing] fix phpdoc
  [Yaml] Fix comment containing a colon on a scalar line being parsed as a hash.