Merge pull request #277 from shenki/kernel-openbmc-20160518-1

meta-phosphor: Move to openbmc-20160518-1