Merge fix-landscape-client-startup [f=1180584] [r=ack,free.ekanayaka] [a=Christopher Armstrong]
Get rid of implicit population of the components registry; it's now explicitly created in a function, and used directly when it's needed.