Merge "Add config file flag to javelin"