[r=waigani],[bug=1299120] Fix 1299120 command aliases
Fix bug 1299120 by ensuring that the
preferred command is not displayed as
an alias of another command in juju
help commands.
Change file and function names to
be consistant with the preferred
command.
https://codereview.appspot.com/92080046/
R=fwereade