Merge "DO NOT MERGE: better late than never: fix build id for JB MR1" into jb-mr1-dev

# (like "TC1-RC5").  It must be a single word, and is

# capitalized by convention.

#

BUILD_ID := MASTER

BUILD_ID := JB_MR1

# DISPLAY_BUILD_NUMBER should only be set for development branches,

# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for