FACES-1669

Flatten Maven groupId hierarchy