Merge "Fix retrieval of resourceInputObj in delete e2e" into casablanca