Moved call from cf api proxy to own resource.
Merge remote-tracking branch 'origin/master'