Unset loading[$id] in ContainerBuilder on exception
[DependencyInjection] added a test for the previous merge (refs #7261)