Merge "Cover both enabled and disabled cases in nested snat validation test"