[master] Merge branch 'trac5021' (fixes after 5039)

diff --cc src/lib/cc/simple_parser.h
index 7a768665889c98ce6bfd3ef8369c5b6e59fa8e03,31bc835a7ce9c8aafbbfdda63cdec497cb49bfa8..82e9cd4267819e5cf1b4d142201cb74ddc8f7309
--- 1/src/lib/cc/simple_parser.h
--- 2/src/lib/cc/simple_parser.h
+++ b/src/lib/cc/simple_parser.h
@@@ -8,9 -8,9 +8,10 @@@
  #define SIMPLE_PARSER_H
  
  #include <cc/data.h>
+ #include <vector>
  #include <string>
  #include <stdint.h>
 +#include <vector>
  
  namespace isc {
  namespace data {