removed closing comments altogether from cisco
Merge remote-tracking branch 'origin/lpedrosa' into unstable
fixed luis's unit test by adding hostname