Adding ability in spiff template to override properties.scim.userids_enabled

See related thread at https://groups.google.com/a/cloudfoundry.org/d/msg/vcap-dev/xC8zK5i3s-4/94_69HXaZrwJ
Merge remote-tracking branch 'origin/pr/338' into develop

Conflicts:
	packages/ruby
	src/gorouter