making the AETHER-2304 changes for the aether-1.5 branch
also updating with latest aether-roc-api and aether-roc-gui from aether-1.5 branch

Change-Id: I27fd8c5389536747279d910dc05ae97889b07350
7 files changed