fixing metrics path
adding rosdistro as an argument to StackMetrics
fixing merge conflict