Merge branch '18-add-endpoint-to-show-status-of-encryption' into 10-remove-encryption-endpoint

Update the new endpoint for removing encryption to follow some other
changes: adding the http method to callback names, and renaming of
device path constants.