Merge "Update requirements to use jjb 2.0.3"