Merge pull request #239 from mhaskel/pull_master_to_1.1.x

Pull master to 1.1.x
1.1.2 prep
Merge pull request #240 from mhaskel/1.1.2-prep

1.1.2 prep
Use apply manifest instead of timeout transaction if it does hang
Merge pull request #241 from cyberious/InstallCert

Use apply manifest instead of timeout transaction if it hangs
Merge pull request #242 from mhaskel/test

merge 1.1.x into master