support for ip dependend secure_auth and autoassign/autoenroll

Change-Id: I2770fa301a6c6cd5d7108870e6f1f40d5ba0c93f
Merge "support for ip dependend secure_auth and autoassign/autoenroll"