Merge "Replace core-junit with junit"