Merge fixes:
 - Re-applied parts from ea2c66d41813ffe0a73e9227d41cf335eedf7fb6 (orig)
   that got lost during merging.
 - Repair InvocationSite as of Bug 384380 (one method lost).
 - Import fixes in tests
8 files changed