Merge "Updating integration tests due to changed l2switch functionality for address...