Task #10811: intermediate merge of...

.gitattributes

SAS/DataManagement/Cleanup/CleanupService/service.py

SAS/DataManagement/StorageQueryService/cache.py

...ent/RAtoOTDBTaskSpecificationPropagator/lib/translator.py

SAS/ResourceAssignment/ResourceAssigner/lib/assignment.py

...rceAssignment/ResourceAssigner/test/t_resourceassigner.py

...ceAssignment/ResourceAssigner/test/t_resourceassigner.run

...tEstimator/resource_estimators/base_pipeline_estimator.py

...tEstimator/resource_estimators/base_resource_estimator.py

...mentEstimator/resource_estimators/calibration_pipeline.py

...AssignmentEstimator/resource_estimators/image_pipeline.py

...entEstimator/resource_estimators/longbaseline_pipeline.py

...rceAssignmentEstimator/resource_estimators/observation.py

...ssignmentEstimator/resource_estimators/pulsar_pipeline.py

...ResourceAssignment/ResourceAssignmentEstimator/service.py

...ssignment/ResourceAssignmentEstimator/test/CMakeLists.txt

...r/test/data_sets/t_resource_estimator.in_imaging_pipeline

.../test/data_sets/t_resource_estimator.out_beam_observation

...t/data_sets/t_resource_estimator.out_calibration_pipeline

.../test/data_sets/t_resource_estimator.out_imaging_pipeline