Bug 926466: fix another typo; a=bustage
Merge default -> production