[CB-2896] split writing of working tags off here, multipart tags not supported
Merge remote-tracking branch 'apache/master'
CB-2725: Fix www deploy issues with symlinks

- Fixes issue when 'www' is a symlink
- Fixes issue with symlinks when deploying to an actual device