Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java

sql/2.6.8升级2.6.9.sql

@@ -179,10 +179,6 @@ alter table device_mobile_position
 alter table device_mobile_position
     change createTime create_time varchar(50) null;
 
-alter table gb_stream
-    add constraint gb_stream_pk
-        primary key (gbStreamId);
-
 alter table gb_stream
     change gbStreamId gb_stream_id int auto_increment;