Route builder + service builder changes as per Principal object

Merged Roshan Patil requested to merge Roshanp-JWTChanges into devbranch

Merge request reports