Made compile on CentOS 6.4, g++ 4.4.7, removing extraneous typename keywords.
adding auth metadata to vector clock conflict tracker, and fixing  command in admin cli
Merge branch 'v1.6.x' into sam_1011
Prepare for 1.6.1 release
Merge v1.6.1 into next