Merge "BUG-374: cleanup error messages present in controller startup"