Merge "Update junit reference"