Simplify UI test heirarchy

It's easier if we just stick all these helper methods on the basic TreemapUITestCase rather than have a big inheritance tree. This will be useful for a 3rd party app to just inherit that test case and use those methods.
Fix merge error
Support changing allowed udf choices

This is just the backend on the udf def class
Merge pull request #1237 from RickMohr/specify-roof-geometry

Specify roof geometry
Merge pull request #1232 from OpenTreeMap/topic/backend-for-changing-and-renamning-udf-fields

Support changing allowed udf choices
Remove merge markers
Change resource -> watershed solution, style to match new text
Merge pull request #1238 from RickMohr/specify-roof-geometry-styling

Change resource -> watershed solution, style to match new text
Give max-width to benefit titles

* Helps avoid overflow problems for long benefit names
Merge pull request #1235 from steventlamb/topic/refactor_ui_tests

Simplify UI test heirarchy
wip
wip