Updated branch naming conventions

Updated branch naming conventions to ones agreed on 14.10.