Merge branch 'hotfix/xmlns'
add nfbird namspace
Merge branch 'hotfix/ns' into develop