Fix bugs uncovered in testing
sto639 markups and refactoring for UTs
Merge pull request #69 from Metaswitch/sto639

sto639 markups and refactoring for UTs
Update makefile to support Clearwater Core's version qualifier

Forgot about ralf when I did the other's weeks ago
Update cpp-common
Merge pull request #70 from Metaswitch/cpp_update

[No reviewer] Update cpp-common
Code review markups
cpp-common update
Merge pull request #71 from Metaswitch/mod_update

[No reviewer] cpp-common update
Resolve issues from testing
Merge pull request #66 from Metaswitch/diameter_config

[Reviewer: Alex] Rely on common ralf/Homestead script to create freeDiameter config file
Use new log_cleanup
Merge pull request #72 from Metaswitch/log_cleanup

[No reviewer] Use new log_cleanup
Take latest cpp-common
Merge pull request #73 from Metaswitch/update_cpp_common_1402692370

Take latest cpp-common
Take latest cpp-common and sas-client
Update cpp-common