Conflicts: src/plugins/debugger/watchhandler.cpp Change-Id: If759b6260dfa008738d3a0ce543eb0eead8a8bba