Display service credentials JSON fields in consistent order and resolve "Bugfix: Testing EDS credentials fails for newly-created Service Credentials"
requested to merge 839-bugfix-testing-eds-credentials-fails-for-newly-created-service-credentials into master