Issue 1638 improve link checker

Please pull after pulling the enterprise branch with the same name