Merge release branch 4.13 to master

* 4.13:
  server: fix database exception while searching network offerings (#3947)

Author: DaanHoogland

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

@@ -5357,7 +5357,7 @@ public Pair<List<? extends NetworkOffering>, Integer> searchForNetworkOfferings(
         final Object keyword = cmd.getKeyword();
 
         if (keyword != null) {
-            final SearchCriteria<NetworkOfferingVO> ssc = _networkOfferingDao.createSearchCriteria();
+            final SearchCriteria<NetworkOfferingJoinVO> ssc = networkOfferingJoinDao.createSearchCriteria();
             ssc.addOr("displayText", SearchCriteria.Op.LIKE, "%" + keyword + "%");
             ssc.addOr("name", SearchCriteria.Op.LIKE, "%" + keyword + "%");