Moved user and endpoint config instantiation

Change-Id: I4f19c3c5fcc7f9b4058a60bd6bc13c44c30e4302
Merge "Moved user and endpoint config instantiation"