Adding the clientdentifier to the metrics flow
add tests for model and dao
Merge branch 'AGPUSH-685'