Merge pull request #316 from wmathurin/unstable20

Latest shared
Login override key in template plist files
Merge pull request #318 from khawkins/unstable20

Login override key in template plist files