Merge "Move javelin2 over to use oslo logging"