SWITCHYARD-1873 - A few last-minute tweaks to get us over the hump.
Will investigate the propBoolean issues as a separate JIRA after this is
all committed.
SWITCHYARD-1873 - Cleanup of unneeded custom converters