Pass the service-catalog if any to the context

Change-Id: Idc005b39f28a0fd30058d263643a44c777682f35
Merge "Pass the service-catalog if any to the context"