fixes #1646, #3103 - enable cloning and locking of templates
Merge remote branch 'origin/develop' into develop
Fixes #3377 - Add altlinux support
Refs #6641 - Revert "Explcitly add fog-json and fog-brightbox for jenkins"

This reverts commit f16e76bfa3fd08404a17c45bef2b0b7cbadefe56. Looks like
the issues with Jenkins were due to a Bundler API issue, see
http://bundler.io/blog/2014/07/16/bundler-api-outages.html for details.
Merge remote branch 'origin/develop' into develop