Merge "Deprecating methods (and a constant) for JB MR1" into jb-mr1-dev