Fix bug deserializing an option containing a case object when the case object also has a context override mapping it to a string.
Merge remote-tracking branch 'origin/master' into scala_2.9.x_backport