removed 'combineByKey' instrumentation
added recognition of shuffle id when calculating inputs for joins