Eschew barclamp merge conflicts.
Merge branch 'release/fred/cloudera-os-build' into cloudera-os-build
Merge branch 'release/fred/master'
Move barclamp submodule refs back.
Move barclamp submodule refs back.
Merge branch 'master' into cloudera-os-build
Make sure refs are up to date.
Merge branch 'master' into cloudera-os-build
Make sure refs are good.
Add updated submodule references for cloudera-os-build
Merge pull request #961 from galthaus/pull-req-master-f73b15b0de

Merge fred into development and update refs for recent SUSE pulls [9/12]
Merge pull request #962 from galthaus/pull-req-cloudera-os-build-95e544580a

Merge fred into development and update refs for recent SUSE pulls [10/12]
Merge branch 'master' into cloudera-os-build
Make sure refs are correct
Merge branch 'master' into cloudera-os-build
Update refs
Merge pull request #965 from galthaus/pull-req-master-c09fef6c78

More refs [1/4]
Merge pull request #966 from galthaus/pull-req-cloudera-os-build-ae1bb8c3bd

More refs [2/4]
Merge remote-tracking branch 'origin/cloudera-os-build' into cloudera-os-build
Merge branch 'master' into cloudera-os-build