Merge "Remove usage of neutron-debug since it has been removed"