merges mozilla -> fx-desktop-builds and removes no-op/debug lines from nightly and sendchange