MFC r274095:
  Fix VOLUME_LABEL when BRANCH contains '-' and '.'
  characters, in particular '-' and '.'.

Insta-MFC ok:	re (hrs)
Sponsored by:	The FreeBSD Foundation
[SA-14:25] Fix kernel stack disclosure in setlogin(2) / getlogin(2).
[SA-14:26] Fix remote command execution in ftp(1).

Approved by:	so (des)
MFC r273985:

Add the less-ambiguous freebsd-version command.