RN-6.0 -- Nova instances hang bug

Change-Id: I149731f87b9ce865c9123d17a2887937399255e6
Merge "RN-6.0 -- Nova instances hang bug"