More Code Quality Changes

Major points

1) ENUM using correct case but implemented underlying code to allow external setup to still be lower case.  This required internal upper casing for all that use it and for some additional getter/setters for spring.  If we decide to make a breaking change later to remove this internal adjustments, it should be left for waffle 2.
2) Use guava joiner rather than stringBuilder where comma delimited items were being created.