LPS-45225 Moves diff classes to package diff
Merge branch 'pull-request-2866'