HELIX-425: Porting the fix to handle partition level constraints from 0.6. to 0.7
[HELIX-425]: Porting the fix to handle partition level constraints from 0.6. to 0.7
[HELIX-425] Fixing formatting issues with the previous commit