Bug 13863: Fix Datatables paging on the cities and search history pages

Test plan:
Go on admin/cities.pl and catalogue/search-history.pl and confirm the
pagination is not broken anymore.

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Fixed conflict so patch applies on 3.18.x

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt

@@ -11,7 +11,8 @@
                 { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
             ],
             "aaSorting": [[ 1, "asc" ]],
-            "iDisplayLength": 10
+            "iDisplayLength": 10,
+            "sPaginationType": "full_numbers"
         }));
     });
 //]]>

koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt

@@ -17,7 +17,8 @@ $(document).ready(function() {
             { "sType": "title-string" },
             null,
             null
-        ]
+        ],
+        "sPaginationType": "full_numbers"
     }));
 
     $('#tabs').tabs();