Merge "Build against the JB SDK" into jb-ub-mail