Merge branch 'master' into 'fix_service_eq_node'

# Conflicts:
#   tower/ui/service_logic.js
2 jobs for fix_service_eq_node in 33 seconds (queued for 1 second)
latest