Roadmap update, tweak proposal index

Change-Id: I210a174159dce190fef8a837d1f70391078f9a15