BACKLOG-919 NameIdFormats can now be only configured for SP's
Merge remote-tracking branch 'origin/develop' into BACKLOG-919
Merge branch 'BACKLOG-919' into develop