rmdir(2) claims

rmdir(2) claims
       ENOTDIR
              pathname,  or  a  component  used as a directory in
              pathname, is not, in fact, a directory.

       ENOTEMPTY
              pathname contains entries other than . and .. .

meaning what we really want to return here is ENOTEMPTY

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================