libsyntax: Separate multiple inherited traits with `+`
librustc: Fix silly bug in AST conversion for const vstores. rs=bugfix

Means that we'll need another snapshot to rid the language of `[const T]`.
auto merge of #5230 : pcwalton/rust/const-vstores, r=graydon