Merge pull request #16 from noelbk/contrail

Fix nova 401 and redis
1) Switch back to standard redis configuration and port
2) Use apache-cassandra for Fedora as datastax had become unreliable
   needed picking up openjdk also.
Merge branch 'master' of github.com:dsetia/devstack
merge https://github.com/dsetia/devstack/pull/15 request from frank-borkin
get rid of redundant sample localrc files
fixed contrail patching to apply if already partially applied and fail if any hunks fail
merged dsetia/master