Merge branch 'stable-2.11' * stable-2.11: OnStartStop: Remove unused config member variable MotdFileBasedConfig: Remove declaration of unthrown exception Supports multi-line MOTD messages Change-Id: I1ad2fee9ed30604897a47f9f24d7864895338aab