24474 - cleanup
24495 - registration controller changed to core
Merge pull request #249 from cannontech/master

merge cannontech to gsn master
Merge pull request #250 from gsn/master

merge master to staging