remove Nirvanix references since  Nirvanix service no longer exist
Merge pull request #1231
Merge pull request #1231 in master