Fixed http links that were obsolete and various edits

Change-Id: I91d6f54869ef0cfd689fa9f351643d70a43630bd