more indentation fixes
Merge branch 'nfs_storage'
more indentation fixes