fixing FindBugs scariest for replaceFirst() method call that does not assign the return value
Merge branch 'integration' of https://github.com/schubergphilis/CloudStack into integration