Manually revert the patch to cleanup aliases since now its propely handled in the ip assignements. Ticket #2495
Set the interface as first here to properly be able to identify it after in php code. Ticket #2495
Whitespace fixes