Consolidated Generic Tile Bonus Uniques (including Friendly Land, Foreign Land) (#3232)

* Redid things with help from HadeanLake:

-"+[]% combat bonus in []" Unit Unique
-"+[]% combat bonus for units fighting in []" Nation Unique
-Both of these can check for terrain or Friendly Land or Foreign Land
-Function to add stacking modifiers
-Himeji Castle and Foreign Legion had uniques changed to fit this syntax
-Old way still works for now, but deprecated

* fixed comments about deprecation and the new syntax

android/assets/jsons/Civ V - Vanilla/Buildings.json

@@ -676,7 +676,7 @@
 		"isWonder": true,
 		"greatPersonPoints": {"production": 2},
 		"providesFreeBuilding": "Castle",
-		"uniques": ["+15% combat strength for units fighting in friendly territory"],
+		"uniques": ["+[15]% combat bonus for units fighting in [Friendly Land]"],
 		"requiredTech": "Gunpowder",
 		"quote": "'Bushido is realized in the presence of death. This means choosing death whenever there is a choice between life and death. There is no other reasoning.'  - Yamamoto Tsunetomo"
 	},

android/assets/jsons/Civ V - Vanilla/Units.json

@@ -1149,7 +1149,7 @@
 		"requiredTech": "Replaceable Parts",
 		"upgradesTo": "Infantry",
 		"obsoleteTech": "Plastics",
-		"uniques": ["+20% bonus outside friendly territory"],
+		"uniques": ["+[20]% combat bonus in [Foreign Land]"],
 		"attackSound": "shot"
 	},
 	/*

android/assets/jsons/translations/template.properties

@@ -859,6 +859,7 @@ WaterAircraftCarrier =
 
 Composite Bowman = 
 Foreign Land = 
+Friendly Land = 
 Marine = 
 Mobile SAM = 
 Paratrooper =