Merge pull request #996 from lingalamadhukar/MIFOSX-1391

MIFOSX-1391 Removing multiple creation screens for client and groups
MIFOSX-1161 Fix for populate default values from product defination