test
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/megam/builder/delete_node.rb
delete without identityfile
pass tenant-id