fix node-4 mac address
Merge branch 'test' with master
add bonfire-dev-2 entry