Fix TestSecondaryNameNodeUpgrade to work both in seq and parallel mode
Fix HsftpFileSystem test
Merge remote-tracking branch 'origin/fb-YAHOO-238-trunk-gd' into fb-YAHOO-238-trunk-gd