Add Icehouse and Juno entries to glossary

Change-Id: Ief192195bb413a1555c45a94f960f0dd16ba9e3b
Update nova options for icehouse

Change-Id: I45eb0141576d5f5d5d65814d0da550aac4a3fe93
Merge "Update nova options for icehouse"
Merge "Add Icehouse and Juno entries to glossary"