Patch M21 Sample Analysis Family/Type

By mistake:

1. some SampleAnalysisType record ids contain %20 (due to blanks in the code).
2. The SampleAnalysisFamily FlowAssuranceProperties should have been called FlowAssurance.