Merge branch 'refactor/svc-spec' into 'develop'

SRM Refactor: Service Specification Endpoints

See merge request !17