Merge branch 'stable-2.7'

* stable-2.7:
  Mark ALREADY_MERGED changes as merged in the DB

Change-Id: I360c0593948786fe95418f7001b22b58a1eaee92