merged from master and bumped version
make sure accessory packages are also installed
fix NullPointerException when restoring a currently not-deployed Site