Update upgrade suits2

@liewegas 
@tmuthamizhan 
@SandonV 

I believe it's better now - goal make sure that d-f-x and f-x suites on giant are synced up with the latests suites on master

Pls review