Merge v1.1 to master_vca_intg

Signed-off-by: Philip Joseph <philip.joseph@riftio.com>