Stack Issue

Address open TODOs for Graylog 2.2.0 #3211

Project graylog2-server