Repair broken parent link in the scanner
add some comments
remove unused argument
Fix unit test
Merge pull request #9008 from owncloud/repair-parent-stable6

Repair broken parent link in the scanner - stable6