More merge fixes:

 - We can't resolve outside a PantsContext, but we don't need to
   anyway.

- Another ivy invocation that wasn't under a workunit.