[SPARK-2069] MIMA false positives 

Fixes SPARK 2070 and 2071