Edited country names to match official English short country names in ISO 3166
Added some OpenShift environment detections to web-service demo