Fix test_updater.py test case failure

Rebuild server repository in test_5_all_targets() - other test cases may not have properly restored the contents of the repository.
Clean up extraneous dependencies test following Vlad's review.
Merge remote-tracking branch 'upstream/demo2' into demo2