Issue #2291081 by pounard: forum_node_view attempt an unnecessary vocabulary_load() under certain circumstances.
Issue #1182374 by lyricnz, xendil, sivaji, brianV: Code style fixes for includes/filetransfer.