Fixing lint comments
Fixing lint comments

Final fixups

Restoring some code lost in merging

Removing trailing space

mesosphere/marathon-ui,mesosphere/marathon-ui,cribalik/marathon-ui,cribalik/marathon-ui