Update singular routes to use singular_path

Also only use PATCH on API version 1.6 or newer
Merge pull request #3727 from smarterclayton/fix_environment_variable_routes

Merged by openshift-bot