Squashed commit of the following:

commit bbfccae023e45a67573da93df40a8b5929373822
Author: Amanda Dierickx <amanda.kay.dierickx@hp.com>
Date:   Thu Jun 12 19:20:11 2014 +0000

    Fix for exit on yes bug on all uninstaller scripts.

    All uninstaller scripts were exiting when the user selected "y" to
    uninstall. Needed an "AND" instead of an "OR".

    Change-Id: Ied55304d50f7bd169addad6799a7b898f15effd9

Change-Id: Id85ba36016ff330c7e992273c7b1356031adb4e3