Removed ParameterizedSmileModelDiscreateVolatilityFunctionProvider
Added tests and fixed problems related to pull request  topic/PLAT-6701 #154
Merge branch 'refs/heads/topic/PLAT-6701' into topic/PLAT-6702

Conflicts:
	projects/OG-Analytics/src/main/java/com/opengamma/analytics/financial/model/volatility/discrete/ParameterizedSABRModelDiscreteVolatilityFunctionProvider.java
	projects/OG-Analytics/src/main/java/com/opengamma/analytics/financial/model/volatility/discrete/ParameterizedSmileModelDiscreateVolatilityFunctionProvider.java