Merge changes from topic "mar31" into rvc-dev

* changes:
  Introduce database schema locking.
  Progress towards database schema locking.