Merge "Update JJB version to 2.0.6"