Merge "Migrate to junit 4.11"