Merge "Bug 2435 - Controller/MD-SAL throwing ModifiedNodeDoesNotExistException except...