Merge "Add note on JJB defaults"