Merge commit 'ce803ae7b9162f92f43e64922b7d610e652ab468' * commit 'ce803ae7b9162f92f43e64922b7d610e652ab468': Update some class names in plugin.xml that were not updated by the refactoring.
Merge commit 'ce803ae7b9162f92f43e64922b7d610e652ab468' * commit 'ce803ae7b9162f92f43e64922b7d610e652ab468': Update some class names in plugin.xml that were not updated by the refactoring.