Worked on below items

 1. In mac we have a space at end (edit case)
 2. For Server we need to specify “Enter or Choose mac”

Change-Id: Ie7de1d4fffc2413e0240aa1602102a9800505f57