Trim whitespace from enrollment token on save

Bug 46873

Change-Id: Ib59aad556a8012e11bea80791476a88b22a40c70
Merge "Trim whitespace from enrollment token on save"