Fix JIRA's:
CISWMI-272	VEL3D-CD has unnecessary capabilities in the Capabilities dictionary
CISWMI-274	Vel3d-cd parameters have misspelling in name
CISWMI-275	VELPT-D unnecessary capabilities in the Capabilities dictionary
CISWMI-276	 VELPT-D autosample error
CISWMI-280	 VELPT-D status particle error
CISWMI-281	 VELPT-D Configuration Error
Fix JIRA's:
CISWMI-272	VEL3D-CD has unnecessary capabilities in the Capabilities dictionary
CISWMI-274	Vel3d-cd parameters have misspelling in name
CISWMI-275	VELPT-D unnecessary capabilities in the Capabilities dictionary
CISWMI-276	 VELPT-D autosample error
CISWMI-280	 VELPT-D status particle error
CISWMI-281	 VELPT-D Configuration Error
Fix JIRA's:
CISWMI-272	VEL3D-CD has unnecessary capabilities in the Capabilities dictionary
CISWMI-274	Vel3d-cd parameters have misspelling in name
CISWMI-275	VELPT-D unnecessary capabilities in the Capabilities dictionary
CISWMI-276	 VELPT-D autosample error
CISWMI-280	 VELPT-D status particle error
CISWMI-281	 VELPT-D Configuration Error
Fix JIRA's:
CISWMI-272	VEL3D-CD has unnecessary capabilities in the Capabilities dictionary
CISWMI-274	Vel3d-cd parameters have misspelling in name
CISWMI-275	VELPT-D unnecessary capabilities in the Capabilities dictionary
CISWMI-276	 VELPT-D autosample error
CISWMI-280	 VELPT-D status particle error
CISWMI-281	 VELPT-D Configuration Error
JIRA fixes
JIRA fixes
JIRA fixes
JIRA fixes
Merge remote-tracking branch 'upstream/master' into vel3dc_dev
JIRA fixes
JIRA fixes
JIRA fixes
JIRA fixes
JIRA fixes
Merge pull request #344 from ronkyo/vel3dc_dev

Vel3dc JIRA Fixes
Fixes to hanging data regex, including tests exersizing the fix.
Merge pull request #345 from emilyhahn/nutnr_dev

CIDEVMI-1399 Fixes to hanging data regex for nutnr_j_cspp
Merge remote branch 'upstream/master' into dosta_merge
fixed indentation and other pep8 issues