fixes #3088 - Add checkbox to select thin or thick provision for vSphere volumes

(cherry picked from commit 52d3a00c03c543f4b4c6a4db5b2d81907589de0a)
fixes #3097 - foreign key error on deleting trend

(cherry picked from commit c5e925f04e2f3e8c0f74d25047f5d690423ab1a3)
Fixes #2586 - Revert "Refs #2002 - Fog quick hack"

This reverts commit d37be454fa99c808acf7a89507ee6fd714f139de.
The original commit is not needed becase fog was upgraded.

(cherry picked from commit ffeedaa6178db808022a41f4ea095a684a49e3db)
fixes #3093 - invalid data for a subnet address or mask returns "is invalid and is invalid"

(cherry picked from commit 16874851177cc1888e59e28acc67303e2be87e36)
fixes #2764 - settings defined in settings.yaml file are now read-only

(cherry picked from commit 4dbf662451f98c9bf9385cea4543a182d6ed7b8d)
fixes #3095 - for new trend, disable input of trend_name if not FactTrend

(cherry picked from commit 460215e8e0d0fc7e5d63cbce1c6ddf642156c68a)
fixes #3072 Vmware: error listing VMs

(cherry picked from commit f925e9f8f5a0d84dae01efeffcfd58604e276ca7)
fixes #3110 Association of vSphere VMs fails

(cherry picked from commit 2ddd6b2cc8c37120c20d5bc5b8689ac5f8dfb883)
fixes #3089 - Updating settings causes settings page to load again within the page

(cherry picked from commit 76fec0747a538c639b9484c8e4c3d01916b891a0)
Fixes #2984 - API v1/v2 StatisticsController and remove JSON from UI controller

(cherry picked from commit f78b465177a740b6c2641b8ec05967198139af92)
fixes #3087 - fix space before parenthesis warning

(cherry picked from commit 90c74cf4388dea9924a4079b109ebce3fd22515d)
fixes #3071 - OS edit failed on foreign keys since config_template_id was '0' on blank

(cherry picked from commit f76e5eee7dcbea2bdcfb15beec84894214133093)
fixes #3090 - new puppetclass creation fails when adding smart variable

(cherry picked from commit 5aca6d3c91ac1e4576caf29a4fa0075cc41bcb3b)
fixes #3077 - locale was set to last language by default

(cherry picked from commit 219879c105c49c098945a5a991b61daf892f3567)
Fixes #3130 - Use the standard CentOS mirror

(cherry picked from commit 00ddc9db99d81efb9d64414f5001f29042996a58)
fixes #3120 - bumped version of apipie-rails

(cherry picked from commit 36c04c36a0b48e3cb3eda6b6ce4711de58c3441b)
fixes #2810 - more restful API v2 JSON responses in puppetclasses

NOTE: breaking changes to API v2 api/lookup_keys does not exist, replaced by api/smart_variables and api/smart_class_parameters
(cherry picked from commit 21bf889acc5cb898a2f0888153e4aa46abe40cde)
Reverting string changes for 1.3
i18n - extracting new, updating rails, pulling from tx
Release 1.3.0-RC2