Backward compatibility for User management

Change-Id: I844d959852cd40fa242ac56b6efa36b2982e73ec
Signed-off-by: Sapan Shah <sapshah@cisco.com>
Merge "Backward compatibility for User management"