Merge branch 'esr68' of github.com:mozilla/gecko-dev into current

Add DISPLAY_VERSION definition so updater understands.

Fix some logic errors for the Australis-Photon theme.

Fix missing prefs.