Added startup scripts, added new create-certificates-new.sh, and updates
Fix merge

Merge remote-tracking branch 'origin/master'