"isolov submitted oks with tag master for tdaq-10-00-00"

oks patch to fix ADTCC-261 and ADTCC-313

=== oks ===

use flock on /var/tmp before entering oks-commit.sh pull/push section (Igor Soloviev)