Merge "Add apache metadata to horizon classes"