Changed use of flavors for Integration tests

Added running integration tests with special flavor if flavor isn't specified in parameters

Change-Id: I5fe9fa57c9fea3766032a15f8a5e6fd7f6a58755
Merge "Changed use of flavors for Integration tests"