WS-968 Albany template needs 3.1 check, fixes