Fix profile cleanup
Fix profile cleanup

Handle JSON in addition to XML when profiles are about to be removed.

Change-Id: I1b174f71c25746b5263010b95c56228a8cb940b3
Reviewed-by: Priya Joshi <3c6cfa6f57440adfc837c4ad04483313acbc2582@morganstanley.com>

guillaume-philippon/aquilon,guillaume-philippon/aquilon,guillaume-philippon/aquilon,quattor/aquilon,quattor/aquilon,quattor/aquilon