LPS-38608

Sending you the whole branch. You can send the javascript commits to Jim if you want, but I will do it anyways after Brian has pushed the commits in (he might change some names that affect the javascripts, so...)

There is one other commit that contains generic changes (new interface/service builder changes, etc.)