Fixed whitespace and header inclusion style problems.
Made peer_address_set_t::iterator be a const iterator, made initial_join.cc not use non-const references.
Fixed some style problems (explicit constructors, include ordering).
Handled several style problems related to the use of long or short (using NOLINT to silence the warnings).
Put NOLINT on all the json adapters for (unsigned) (long) long types.
Moved unittest_utils and clustering_utils to their HOME.  To the unittest directory!
Maked unittest_utils and clustering_utils and some other file use the unittest namespace.
Moved mock/branch_history_manager.* to unittest/branch_history_manager.*.
Updated copyright notices on modified files of the sam_demock branch.
Made semilattice_manager.cc not include unittest headers.
Removed TCC_ include guards around branch_history_manager.cc (which was formerly branch_history_manager.tcc).
Merge branch 'sam_demock' into sam_84