Merge branch 'origin/master'
Fix incorrect module name for ftp upgrade operation.
Fixed NPE in FTP implementation.
Clean up of some warnings.
Merge branch 'origin/develop'