Deployment Enhancement in Windows Domain Environment

Please refer to Commits comments