Refactor call home module, bootstrap and access tests
Refactor call home module, bootstrap and access tests
Merge remote-tracking branch 'origin/master'