Merge branch 'refs/heads/2.7.2'

# Conflicts:
#	pom.xml
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java