Fixed to filter out compat bundles or OF10 case

Change-Id: I72cd8e1820ee058314efb15522083304be01b8f1
Signed-off-by: Ed Warnicke <eaw@cisco.com>
(cherry picked from commit 4c17b6bc6d86411dfd1e9fcda57cc44dbd8dd3bf)

Change-Id: I47bbf320e636b4cfdb1f6089fb347f3740e351af
Signed-off-by: Luis Gomez <ecelgp@gmail.com>