Blocks not shown on proposal nodes

The blocks are not displayed on proposal nodes, but are displayed on agenda nodes. The block should be displayed on either of the two node types (proposals and agendas). This happens because the democracy_forum_get_council_term only returns terms in the council. This function is only called in one place, and should return council or proposal terms. So, the attached patch renames the function, and returns the term from either taxonomy.