Merge proposals dependent on lp://staging/~dholbach/developer-ubuntu-com/fix-consistency-command

1. fix-consistency-command
2. Dependent merge proposals