Changed method scopes to make subclassing easier
Merged getfeatureinfo-html-99 into getLegendImageFromWms-183