Mirror changes from parent manifest

Change-Id: Ib34354eab0ef58657591d05ca40ab92c50d54354
Reviewed-on: http://review.couchbase.org/23918
Reviewed-by: Sriram Melkote <siri@couchbase.com>
Tested-by: Sriram Melkote <siri@couchbase.com>