merge from Development

[avollkopf]

some updated requirements and tweaks in the influx handling a one fix in satellite controller case of cbpi stop