Merge "Remove skipping flavor_access_add/remove related tests"