Merge "Add exception for mdsal to branch v2.6.x"