Merge changes I8b48655d,I8ff4e371

* changes:
  Rename of InternalNetworkManagementException
  InternalNetworkManagementExceptionTest unit tests