Merge "Mount zookeeper log dir for contrail containers" into release/2019.2.0