Merge "Bug 865: Removed uses of packageNameFromModule"