Grandchildren contexts are now correctly searched for beans.
Added unit test to prove it.
Merge remote-tracking branch 'upstream/master' into upstream_master