Merge remote-tracking branch 'origin/develop' into rfc-9-sarcalibration

Conflicts:
	Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1Model.cpp

Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1Model.cpp

@@ -40,9 +40,8 @@ namespace ossimplugins
 //*************************************************************************************************
    ossimSentinel1Model::ossimSentinel1Model(const ossimSentinel1Model& rhs)
       :ossimSarModel(rhs)
-      , theOCN(rhs.isOCN())
-      , theSLC(rhs.isSLC())
-
+      , theOCN(rhs.theOCN)
+      , theSLC(rhs.theSLC)
    {
 
    }