FED-92: Ported https://github.com/janrain/janrain-backplane-2/commit/3871ada7516d5731fe58a46a8dc42cf4548ad3db to 2012.46_RC2.
FED-92: Ported https://github.com/janrain/janrain-backplane-2/commit/d123b821014979507c752989ade29cdf9d34db8a to 2012.46_RC2