Bug #2535: put quotes around role name in the instantiate extra template
(cherry picked from commit 5edbe4df2d956e04a1739fe012d887fa1842700d)
Bug #2541: Fix contributed by Gareth Bult <gareth@linux.co.uk>. Defaults 0 to monitor probes when error occur to prevent syntax errors

(cherry picked from commit 50a288e50d30b925d69070e18d5998020bcb599f)
Bug #2548: Set correct flag for pool retrieval

(cherry picked from commit f213728b21226080d784259e74147379fa11d026)
Use std::string for log file name in module Log

(cherry picked from commit 74414c31b10720458623048a92a19cd31c49e82b)
Take advantage of delete not acting on null values

The code 'delete 0' does nothing. So you can shorten code
like:

  if (x != 0) {
    delete x
  }

to simply: delete x

(cherry picked from commit f7ecf6f8fc7ebdfdb9b9b4ca1000161ccbf56379)
Decode RAW data in update wizard
(cherry picked from commit e39fcba1770ffda8dad0a0e03228c0c3b6ea1e7b)