Merge change 3208

* changes:
  Add "locked" column to sms and pdu tables.