Minor fixes to firewall_aliases_edit

for 2.1 branch.
This is a backport of pull requests #1292 and #1293 
I was doing and testing the changes on a 2.1.5 system anyway, so might as well apply them to 2.1 branch.