removing wip [KFSQA-1060]
fixing issues with child vendors being used sometimes [KFSQA-1014]
removed uneeded lines and hard coding that had expired account [KFSQA-589]
removed extra stepsand hard coded values [KFSQA-728]
[KFSQA-1036] merged from master