Squashed commit of the following:

commit a3c507d679655f85000420d7415d00835f807fb1
Author: Gonzalo Correa <gonzalo.correa@hp.com>
Date:   Thu Nov 20 11:54:52 2014 -0800

Infrastructure monitor/SBAPI updates to support phandle verifier and
miscellaneous bug fixes.

Change-Id: I9de0c7bb9e2d3e09e07b89c3c74ecd6a1a259304