Fix problem with schema stuck agreement

Change-Id: I7adb7191a0c23c64aaf9ad5cd96bb4e960204962
Closes-bug: #1388920
Merge "Fix problem with schema stuck agreement"