Code review feedback
More code review feedback: better TODo comments, fixed up UTs
Merge remote-tracking branch 'origin/dev_new_homestead_api' into geo_redundancy

Conflicts:
	sprout/registrar.cpp
	sprout/stateful_proxy.cpp
UT