Merge "ojluni: tidy up ojluni files"