MFC r282419, r282435:

MFC r282419, r282435:
 r282419:
   Add logic to detect if the net/bsdec2-image-upload port needs
   to be installed. [1]

   For the cw-ec2-portinstall and ec2ami targets, touch the
   .TARGET file after completion to prevent duplicate invocations.

   Add cw-ec2-portinstall and ec2ami to CLEANFILES.

 r282435:
   Remove a debugging line that snuck in with the previous commit.

Sponsored by:	The FreeBSD Foundation

git-svn-id: svn://svn.freebsd.org/base/stable/10@282618 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f