MB-9168:  update libconflate to be like branch-master.xml

Change-Id: Ia47ef361945ed100fb4bac0cbb587a459ff1ecce
Reviewed-on: http://review.couchbase.org/29231
Reviewed-by: Philip Labee <philip@couchbase.com>
Tested-by: Philip Labee <philip@couchbase.com>