Merge "Break scan commit out of scanPackage* methods"