https://github.com/puppetlabs/puppetdb/pull/3362
We need to review this pr and get it merged before the next release. This might also involve updating the schema diff check tests.