Merge branch 'master' of git.icinga.org:icinga2

Conflicts:
	components/compatido/compatidocomponent.cpp

diff --cc components/compatido/compatidocomponent.cpp
index 0a06f4715734fae43b99898f5b5b3b94fc930422,badffc16210d96a39da8bb4aa10b5bd21aa50517..e5954bc923b91c3f59ed86d5d7f7a9278c031c88
--- 1/components/compatido/compatidocomponent.cpp
--- 2/components/compatido/compatidocomponent.cpp
+++ b/components/compatido/compatidocomponent.cpp
@@@ -311,12 -298,12 +315,12 @@@ void CompatIdoComponent::SendHello(Stri
        stringstream message;
        message << "\n\n"
                << "HELLO" << "\n"
 -              << "PROTOCOL" << ": " << 2 << "\n"
 -              << "AGENT" << ": " << "I2 COMPATIDO" << "\n"
 +              << "PROTOCOL" << ": " << COMPATIDO_PROTOCOL<< "\n"
 +              << "AGENT" << ": " << COMPATIDO_NAME << "\n"
-               << "AGENTVERSION" << ": " << COMPATIDO_RELEASE_VERSION << "\n"
+               << "AGENTVERSION" << ": " << VERSION << "\n"
                << "STARTTIME" << ": " << static_cast<int>(Utility::GetTime()) << "\n"
                << "DISPOSITION" << ": " << "REALTIME" << "\n"
 -              << "CONNECTION" << ": " << "TCPSOCKET" << "\n"
 +              << "CONNECTION" << ": " << connection << "\n"
                << "INSTANCENAME" << ": " << instancename << "\n"
                << "STARTDATADUMP"
                << "\n\n";