null merge of the 5.0-bugteam symlink test failure fix