Unset loading[$id] in ContainerBuilder on exception
fixed id case when setting a service (also slightly enhanced an error message)
Added '@@' escaping strategy for YamlFileLoader and YamlDumper

Added the possibility to to use '@@' as an escaping strategy for
parameters that should be treated as strings but start with '@'
(i.e. safe mailer passwords).
Merge branch '2.2'

* 2.2:
  updated VERSION for 2.2.1
  Added '@@' escaping strategy for YamlFileLoader and YamlDumper
  [Yaml] fixed bugs with folded scalar parsing
  [FrameworkBundle] changed temp kernel name in cache:clear
  fixed id case when setting a service (also slightly enhanced an error message)
  remove dead code in yaml component
  Unset loading[$id] in ContainerBuilder on exception
  [Console] fixed StringInput binding
  [Console] added deprecation annotation
  [console] added string input test